home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
IRIX Base Documentation 1998 November
/
IRIX 6.5.2 Base Documentation November 1998.img
/
usr
/
share
/
catman
/
u_man
/
cat1
/
merge.z
/
merge
Wrap
Text File
|
1998-10-20
|
4KB
|
133 lines
MMMMEEEERRRRGGGGEEEE((((1111)))) MMMMEEEERRRRGGGGEEEE((((1111))))
NNNNAAAAMMMMEEEE
merge - three-way file merge
SSSSYYYYNNNNOOOOPPPPSSSSIIIISSSS
mmmmeeeerrrrggggeeee [ _o_p_t_i_o_n_s ] _f_i_l_e_1 _f_i_l_e_2 _f_i_l_e_3
DDDDEEEESSSSCCCCRRRRIIIIPPPPTTTTIIIIOOOONNNN
mmmmeeeerrrrggggeeee incorporates all changes that lead from _f_i_l_e_2 to _f_i_l_e_3 into _f_i_l_e_1.
The result goes to standard output if ----pppp is present, into _f_i_l_e_1
otherwise. mmmmeeeerrrrggggeeee is useful for combining separate changes to an
original. Suppose _f_i_l_e_2 is the original, and both _f_i_l_e_1 and _f_i_l_e_3 are
modifications of _f_i_l_e_2. Then mmmmeeeerrrrggggeeee combines both changes.
A conflict occurs if both _f_i_l_e_1 and _f_i_l_e_3 have changes in a common
segment of lines. If a conflict is found, mmmmeeeerrrrggggeeee normally outputs a
warning and brackets the conflict with <<<<<<<<<<<<<<<<<<<<<<<<<<<< and >>>>>>>>>>>>>>>>>>>>>>>>>>>> lines. A
typical conflict will look like this:
<<<<<<<<<<<<<<<<<<<<<<<<<<<< _f_i_l_e _A
_l_i_n_e_s _i_n _f_i_l_e _A
============================
_l_i_n_e_s _i_n _f_i_l_e _B
>>>>>>>>>>>>>>>>>>>>>>>>>>>> _f_i_l_e _B
If there are conflicts, the user should edit the result and delete one of
the alternatives.
OOOOPPPPTTTTIIIIOOOONNNNSSSS
----AAAA Output conflicts using the ----AAAA style of ddddiiiiffffffff3333(1), if supported by
ddddiiiiffffffff3333. This merges all changes leading from _f_i_l_e_2 to _f_i_l_e_3 into
_f_i_l_e_1, and generates the most verbose output.
----EEEE, ----eeee
These options specify conflict styles that generate less information
than ----AAAA. See ddddiiiiffffffff3333(1) for details. The default is ----EEEE. With ----eeee,
mmmmeeeerrrrggggeeee does not warn about conflicts.
----LLLL _l_a_b_e_l
This option may be given up to three times, and specifies labels to
be used in place of the corresponding file names in conflict
reports. That is, mmmmeeeerrrrggggeeee ----LLLL xxxx ----LLLL yyyy ----LLLL zzzz aaaa bbbb cccc generates output that
looks like it came from files xxxx, yyyy and zzzz instead of from files aaaa, bbbb
and cccc.
----pppp Send results to standard output instead of overwriting _f_i_l_e_1.
----qqqq Quiet; do not warn about conflicts.
----VVVV Print 's version number.
PPPPaaaaggggeeee 1111
MMMMEEEERRRRGGGGEEEE((((1111)))) MMMMEEEERRRRGGGGEEEE((((1111))))
DDDDIIIIAAAAGGGGNNNNOOOOSSSSTTTTIIIICCCCSSSS
Exit status is 0 for no conflicts, 1 for some conflicts, 2 for trouble.
IIIIDDDDEEEENNNNTTTTIIIIFFFFIIIICCCCAAAATTTTIIIIOOOONNNN
Author: Walter F. Tichy.
Revision Number: 5.7; Release Date: 1998/01/12.
Copyright c 1982, 1988, 1989 by Walter F. Tichy.
Copyright c 1990, 1991, 1992, 1993, 1994, 1995 by Paul Eggert.
SSSSEEEEEEEE AAAALLLLSSSSOOOO
diff3(1), diff(1), rcsmerge(1), co(1).
BBBBUUUUGGGGSSSS
It normally does not make sense to merge binary files as if they were
text, but mmmmeeeerrrrggggeeee tries to do it anyway.
PPPPaaaaggggeeee 2222